From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Fri, 3 Jan 2014 18:04:06 +0000 (+0100)
Subject: WorkspacesView: fix removal of workspaces that are not at the end
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2954
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1b152e6bd091cabd71ae62487e2809b392f1c540;p=gnome-shell.git

WorkspacesView: fix removal of workspaces that are not at the end

Workspaces can removed from any index, and in particular they
will be removed by the WorkspaceTracker if they stop containing
windows at some point. Make sure WorkspacesView is not confused
and destroyes the right Workspace objects.

https://bugzilla.gnome.org/show_bug.cgi?id=721417
---

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 997d1a8b8..1d0982b79 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -237,29 +237,32 @@ const WorkspacesView = new Lang.Class({
     },
 
     _updateWorkspaces: function() {
-        let oldNumWorkspaces = this._workspaces.length;
         let newNumWorkspaces = global.screen.n_workspaces;
 
         this.scrollAdjustment.upper = newNumWorkspaces;
 
-        if (newNumWorkspaces > oldNumWorkspaces) {
-            for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
-                let metaWorkspace = global.screen.get_workspace_by_index(w);
-                let workspace = new Workspace.Workspace(metaWorkspace, this._monitorIndex);
-                this._workspaces.push(workspace);
+        let needsUpdate = false;
+        for (let j = 0; j < newNumWorkspaces; j++) {
+            let metaWorkspace = global.screen.get_workspace_by_index(j);
+            let workspace;
+
+            if (j >= this._workspaces.length) { /* added */
+                workspace = new Workspace.Workspace(metaWorkspace, this._monitorIndex);
                 this.actor.add_actor(workspace.actor);
+                this._workspaces[j] = workspace;
+            } else  {
+                workspace = this._workspaces[j];
+
+                if (workspace.metaWorkspace != metaWorkspace) { /* removed */
+                    workspace.destroy();
+                    this._workspaces.splice(j, 1);
+                } /* else kept */
             }
-
-            if (this._fullGeometry)
-                this._updateWorkspaceActors(false);
-        } else if (newNumWorkspaces < oldNumWorkspaces) {
-            let nRemoved = (newNumWorkspaces - oldNumWorkspaces);
-            let removed = this._workspaces.splice(oldNumWorkspaces, nRemoved);
-            removed.forEach(function(workspace) {
-                workspace.destroy();
-            });
         }
 
+        if (this._fullGeometry)
+            this._updateWorkspaceActors(false);
+
         this._syncGeometry();
     },